Autogenerated HTML docs for v1.6.6.1-383-g5a9f
diff --git a/git-rerere.html b/git-rerere.html index e4f211d..1eb4f41 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -344,7 +344,7 @@ </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<div class="para"><p>Normally, <em>git-rerere</em> is run without arguments or user-intervention. +<div class="para"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state.</p></div> <div class="vlist"><dl> @@ -354,7 +354,7 @@ <dd> <p> This resets the metadata used by rerere if a merge resolution is to be -aborted. Calling <em>git-am [--skip|--abort]</em> or <em>git-rebase [--skip|--abort]</em> +aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em> will automatically invoke this command. </p> </dd> @@ -466,29 +466,29 @@ would require you to resolve the conflict, introduced by the commits marked with <tt>*</tt>. However, this conflict is often the same conflict you resolved when you created the test merge you -blew away. <em>git-rerere</em> helps you resolve this final +blew away. <em>git rerere</em> helps you resolve this final conflicted merge using the information from your earlier hand resolve.</p></div> -<div class="para"><p>Running the <em>git-rerere</em> command immediately after a conflicted +<div class="para"><p>Running the <em>git rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in them. Later, after you are done resolving the conflicts, -running <em>git-rerere</em> again will record the resolved state of these +running <em>git rerere</em> again will record the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch.</p></div> <div class="para"><p>Next time, after seeing the same conflicted automerge, -running <em>git-rerere</em> will perform a three-way merge between the +running <em>git rerere</em> will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually -resolve it. Note that <em>git-rerere</em> leaves the index file alone, +resolve it. Note that <em>git rerere</em> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> -(or <tt>git diff -c</tt>) and <em>git-add</em> when you are satisfied.</p></div> -<div class="para"><p>As a convenience measure, <em>git-merge</em> automatically invokes -<em>git-rerere</em> upon exiting with a failed automerge and <em>git-rerere</em> +(or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div> +<div class="para"><p>As a convenience measure, <em>git merge</em> automatically invokes +<em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em> records the hand resolve when it is a new conflict, or reuses the earlier hand -resolve when it is not. <em>git-commit</em> also invokes <em>git-rerere</em> +resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em> when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable).</p></div> @@ -496,8 +496,8 @@ resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable.</p></div> -<div class="para"><p>The information <em>git-rerere</em> records is also used when running -<em>git-rebase</em>. After blowing away the test merge and continuing +<div class="para"><p>The information <em>git rerere</em> records is also used when running +<em>git rebase</em>. After blowing away the test merge and continuing development on the topic branch:</p></div> <div class="listingblock"> <div class="content"> @@ -515,7 +515,7 @@ up-to-date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. -<em>git-rerere</em> will be run by <em>git-rebase</em> to help you resolve this +<em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this conflict.</p></div> </div> <h2 id="_author">Author</h2> @@ -528,7 +528,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-12-03 09:12:46 UTC +Last updated 2010-01-21 17:44:36 UTC </div> </div> </body>
